Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 1 Sep 2011 00:46:58 +0000 (17:46 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 1 Sep 2011 00:46:58 +0000 (17:46 -0700)
commita6c1e3249cde040a1baebe178bdd07d09a6ac876
tree759f2176abc1c4944b1f230a428b1757224e4721
parente8730a3c8f39dea837e352e1d3009bf443c1eb2e
parente41d544a5e29328fc115809aa5b88d092e4fa21e
Merge from trunk.